backward compatible changes for Qt6 (#656)

* Avoid implicit conversion of int to QChar.

In Qt6 the constructor QChar(int code) is explicit by default.

* update codacy coverage reporter

* move coverage generation to focal.

* use binary codacy coverage reporter

diff --git a/.travis.yml b/.travis.yml
index 20041223474e30e96563976fc7712c1c2958ebd8..0f0f054b2c1a4d25cb0ae257121086210f9bd505 100644 (file)
--- a/.travis.yml
+++ b/.travis.yml
@@ -91,7 +91,7 @@ jobs:
           - $HOME/Cache
         timeout: 600
     - os: linux
-      dist: bionic
+      dist: focal
       compiler: gcc
       env:
         - BUILD_TYPE="coverage"

diff --git a/mmo.cc b/mmo.cc
index de303431abd7aadfba3f10f4ecc1723a86fe0b36..2dd973d600183fe7123fb1e6b76bac423ce2497d 100644 (file)
--- a/mmo.cc
+++ b/mmo.cc
@@ -929,7 +929,7 @@ mmo_finalize_rtept_cb(const Waypoint* wptref)
 {
   auto* wpt = const_cast<Waypoint*>(wptref);
 
-  if ((wpt->shortname[0] == 1) && (wpt->latitude == 0) && (wpt->longitude == 0)) {
+  if ((wpt->shortname[0] == '\01') && (wpt->latitude == 0) && (wpt->longitude == 0)) {
     mmo_data_t* data;
     Waypoint* wpt2;
 

diff --git a/tools/travis_script_linux_coverage b/tools/travis_script_linux_coverage
index 925b6972a2800b89b8c8372ab00523f69e76d8f0..8cd6bd42faf5f4d59a57a05bc370329539fdfff1 100755 (executable)
--- a/tools/travis_script_linux_coverage
+++ b/tools/travis_script_linux_coverage
@@ -17,8 +17,7 @@ make -j 3 coverage
 #!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 if [ -v CODACY_PROJECT_TOKEN ] ; then
   # upload coverate report to codacy.
-  wget -nv -c https://github.com/codacy/codacy-coverage-reporter/releases/download/6.2.0/codacy-coverage-reporter-assembly-6.2.0.jar
-  java -jar codacy-coverage-reporter-assembly-6.2.0.jar report -l cpp -f -r gpsbabel_coverage.xml
+  bash <(curl -Ls https://coverage.codacy.com/get.sh) report -l CPP -r gpsbabel_coverage.xml
 else
   echo "Skipping codacy coverage upload as CODACY_PROJECT_TOKEN is not set."
 fi